Deprecate repo:shortid syntax Upstream-commit: 0542dcc2d05d74081d185c35bc4a92716f348506 Component: engine