LPS-49648 Use full hierarchy to update default values