bug fixed
Merge branch 'develop' into release/3.0.4.0