Version History:

v2.1
+ Fix registration issues

v2:
- Initial port from 1.20.1