merged with latest everything
Merge branch 'feature/merge-bowers' into develop

* feature/merge-bowers:
  merged with latest everything