a6 hotfix merge