backlog of commits to R4_0_5, pushing up to master