Addresses DEVELOPER-407