Register command handling, still has an issue with loadOrCreate.
Merge remote-tracking branch 'origin/develop' into develop