Second wave of commits for PR-1589

n.b. 5605378 needs a corresponding commit to v6d.git, otherwise the build will break.