Merge "add missing config properties found"