Revert "Merge branch 'master' into liquidvisual"

This reverts commit 95ada415f4586da0b38f144c085bfe393c1ce123.