Merge branch 'ar/mksnpath'