Resolve "revisit and extend D2 update retry code"

Merged Francis Dupont requested to merge 2131-revisit-and-extend-d2-update-retry-code into master

Closes #2131

Edited by Thomas Markwalder

Merge request reports