Version 1.0.6
Merge branch 'release/v1.0.6' into develop