Cherry-pick of IU-pilot changes onto R3