Merge "Update ConfigurationContainer interface" into main