10 Commits (CLDC-3669-extract-bu-validations)