fixed inconsistency to master-1.2.x caused by false merge during rebase