Updated to UE 339