OS-3062 Reign in copypasta nature of brand code