this caused more problems than helps
issue #951
issue #954
issue #930
Merge branch 'hotfixes' into develop