Updates for r20193