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