Merge branch 'release/static'
Disable unit test
Merge branch 'hotfix/unit-test-fail-guard-spork' into develop