Merge branch 'release/1_07_final_2'
Merge tag '1_07_final_2' into develop

1_07_final_2