Merge branch 'Near'
Merge branch 'master' into Near