Small tweaks. Probably going to lead to merge difficulties.
Merge remote-tracking branch 'origin/development' into development