Lots of updates that should have been individual commits
* development:
  Lots of updates that should have been individual commits