Merge branch 'bldchn' into next