Update to patch 458 upstream