Merge branch 'fixBug-cgjhZsywrk' into feature_audit