DEVELOPER-810 DO NOT MERGE - Still updating