Merge branch 'foreign/liubo/replace-lockup' into for-chris-4.6