change to a scheduled executor to make sure writes persist if reads do not occur
Merge remote-tracking branch 'origin/1.12'