DEVELOPER-692