Merge branch 'develop' into VCL-1114_misc_small_web_updates