Merge branch 'release/4.0.6' into develop
start 4.0.7
rebased on commons/4.2.1 and data/4.1.8
publish 4.0.7
Merge branch 'release/4.0.7'