CELDL-405 & CELDL 425 - verification
Merge remote-tracking branch 'origin/master'