improve deprecation message Upstream-commit: 63dee4ebc4a5b5be6302f170cb7cb034914dfcf0 Component: engine