2.1 updatepuller behave

Re-issue of #2368 against 2.1-maint.