Updated core shot codes
Merge branch 'release/update_core_shortcodes'
Merge branch 'release/update_core_shortcodes' into develop
Merge branch 'develop'