Merge branch 'fix/902-random-compile-failing' into 'develop'