3 Commits (CLDC-2412-data-privacy-bu)