changes from 3.0.5.3 to 3.0.5.4p1
Merge branch 'release/3.0.5.4' into develop