Merge branch 'build_update' into sprint82