Merge tag '1.0.7' into develop

tag 1.0.7