Temporary changes to test new auto-reconfig 0.8.5 snapshot