Committing PHOENIX-908 patch
Commit PHOENIX-898 patch to 4.0