Version bump 3.0.6
Merge branch 'release/3.0.6' into develop