Merge "Support properties in path when merging overlay configs" into main