Merge branch 'release/poc5-rc10' into develop
Added some shortcuts
Merge branch 'develop'