Merge pull request #5662 from Zuhayr/dev-freeze

Dev freeze
Merge branches 'dev' and 'dev-freeze' of https://github.com/Baystation12/Baystation12 into dev