-- reg impl
Merge origin/master