Issue/master/pup 900 noop refresh

Retarget of #3051 onto master.