Merge branch 'release/4.6' into develop
naming fix
fix registry import.
fix registry import (again).
registry import fix (take 3).
Add missing template.
version bump
Merge branch 'release/4.6.1'