Merge branch 'fix-warnings' into 'master'