#583 more strict repo path checking
Merge remote branch 'fork/583'