HOTFIX: APD-807