Merge "No hard-coded insets type in config calculation" into main