Merging in latest L4 changes