Fixes #7068
Merge pull request #7087 from mwerezak/master

Fixes #7086
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev
Merge pull request #7114 from Zuhayr/dev

Dev