HOTFIX: APD-799