DEVELOPER-1047 (UX)