[steam/el7] Merge from master