Merge "Shortcut Helper - Implement lifecycle of new version" into main