Merge branch 'dev'
Merge branch 'dev'
Allow empty paths for defaultcontext and fixed context
merged master