[Shared] Update to edf03fb