Merge "Reduce memory usage of settings" into main