Merge branch 'hotfix/send_group_images'
added kill switch
Merge branch 'hotfix/kill_switch' into develop