merge core-8-4-branch