upstream update to 7.3.918
upstream update to 7.3.931