Merge branch 'dev' into VideoSprint34
Merge branch 'VideoSprint34' into VID-718-badge