Closes #13323 and carries Upstream-commit: 985fd1c6cc65a29c25d061f350bb938b3c750117 Component: engine