[steam/el7] Sync with master branch