Merge tag '1.0.6' into develop

tag 1.0.6