now forking on config update
merged with master