[albertGQ]

#3 for #6 + Poirier/Klimchuk + #53

I would even do #3 for #6 + Poirier/Klimchuk + #35