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

Fixes #7086
More fixes.
Merge branch 'Baystation12-master'