Merge tag '1_07_final' into develop

1_07_final
Small mistake in gradle
Merge branch 'release/1_07_final_2'