Customer validation in progress
Merge conflicts resolved