Merge "Fix configuration change handling"