Merge "Fix enterprise settings bug" into main