(rebased version of commits c3d503d33d and a81b396a2e) Extra care is taken to save old versions to minimize changes. Closes #12362
c3d503d33d
a81b396a2e