3.3M1 includes some PRs that will hopefully provide some help relative to this topic. Please see my post there.