Merge in Rami's changes from last friday.