Fixed Customer Registration issue.
Merge origin/master