Updated core short codes
Merge branch 'develop'