Issue #2388925 by xjm, preshetin: British again invade config sync