DEVELOPER-810 READY FOR MERGE