Support MWRM entries without path (search file in current directory of MWRM).
Merge branch 'rzwspace' into future