Fixed merge error
Merge remote-tracking branch 'origin/3.1.0' into 3.1