Merge branch 'fixBug-cgjhZsywrk' into develop