DEVELOPER-674