Merge branch 'flake-from-int' into 'develop'