Merge branch 'fix/1742-random-failing-tests' into 'develop'