Merge branch 'fix/sporadic-tests' into 'develop'