Additions for 1.4.1 release Upstream-commit: f0f4e42375353dc04101bb7d0f263500f4d2d046 Component: engine