APD-485 HOTFIX