Merge "add delemeter to full-path, removing delemeter from path-name" into 2.0_beta