Updates in preparation for 6.33.1-b1