DEVELOPER-424 and DEVELOPER-423