Release version 3.0.6.1
Merge branch 'release/3.0.6.1' into develop