Issue #27907: variable rename. (Ville Skyttä) (Merge 3.5->3.6)