DEVELOPER-592