Merge branch 'warning_fix' into sprint78