Merge "Partial config update: various small things"