Improve code/comment/output markings & display consistency Upstream-commit: edab1bd5e5b3b179ea91e675cff6199de109558b Component: engine