Merge "Fix mount path prefix checking." into klp-dev