Merge branch 'hotfix/0.20.3'
Merge branch 'devel': fixes for 0.20.3
Disable all tests on non-local check
Merge branch 'hotfix/0.20.4' into devel