Merge "[res] Don't recalculate configuration twice on init" into main