registration - sync with upstream
Merge pull request #506 from lslezak/registration_update

registration - sync with upstream