Deprecate old tagging format Upstream-commit: 65102d6b3644ff638bb6bf6cabb69af987e61004 Component: engine