Backport versionning bundle from master