Resolve "revisit and extend D2 update retry code"

Closes #2131

Edited by Thomas Markwalder

Merge request reports