Merge "Fix idmap calls when a subdir is present." into cw-f-dev