Improved normalize file sep
Added trim trailing slash
Merge remote-tracking branch 'upstream/develop' into develop