Merge "Consider target path when verifyIdmap." into rvc-dev