Repack and recombine previous commit.
Merge remote-tracking branch 'dpvc/issue672' into v2.3-latest