Merge "multi-res: add parent_ref_valid flag"