Merge branch 'fix-test-forking' into dev