Some cleanup
Merge remote-tracking branch 'origin/register-factory' into development