Commit PHOENIX-907 patch to master