[Shared] Update to 58b723b