Authored by ccbikai

Merge branch 'bugfix' into develop