merge revisions #r8392 and #r8393