Merge "Simplify app-locales B&R stage data retention."