1.9 Release Candidate 4

And the RC3 that I forgot to merge

Change-Id: I9a2660080a33f033b4795157796c9ad03467ef4d