Add changes from dress rehearsal 2014-05-08.