More refactoring.
Merge remote-tracking branch 'origin/dev' into dev