Merge branch 'feature/auto-shortcodes' into 'develop'