Backport 'Use tags that follow the Composer versioning scheme'