fix method incompatability issue
Merge branch 'master' into 2.3