I just had my driver side headlight replaced by mobile service (under the used vehicle warranty) and they used the latest “G” version for my 2016.5 Model S. The top part of my DRL was dimming and thought they might decline the replacement upon arrival but was completed, no problem.