Qual: Removed had coded value for version.
Merge remote-tracking branch 'origin/3.5' into 3.6