Description of problem: HHH-9280 needs to go into EAP 6.3.2.
I've cherry-picked my fixes.
Verified in EAP 6.3.2.CR1.