Late static bindings to allow inhertiance of registry
Merge branch 'develop'