APD-511 hotfix