merge var lang with 17_06_project_develop

Source diff could not be displayed: it is too large. Options to address this: view the blob.

Source diff could not be displayed: it is too large. Options to address this: view the blob.