Add requested comments about old buggy behavior Upstream-commit: 923053d1edac552a8d48cbb293c4ec935a93348b Component: engine