Updates to volume short code for 36
Merge branch 'shortcodes' into develop