HOTFIX: APD-459