Merge 6-2-stable into Datacom version

(This is the first cross-repo pull I've ever tried! so if I get it wrong please be patient. I am not trying to push any changes to gitlabhq but to update my own fork.)