1658 Commits (CLDC-858-validate-beds)