misc
Merge branch 'develop'
Merge branch 'feature_sound_control_overhault_2'
src: thread safety