Merge pull request #6493 from Zuhayr/dev

Dev
Merge branch 'organremoval' of https://github.com/Zuhayr/Baystation12 into organremoval
Third pass.