r3920 copy recent commits from maintenance