Merge "Only add parent profile resolution if strictly greater" into sc-dev