Merge branch 'fix-build' into integration