Adding in comments from party Upstream-commit: d20ba329d1cf2a0cb3a93bd69fc9e6247f338dcc Component: engine