@ruckus Thanks for your work so far. Can you wrap all this up into some failing test cases. Seems you've already done most of the work, I just don't want to mess it up if I try to do it myself. Can you confirm this a problem on 3.2?