Support and test Windowing in multi-insert queries
Resolve merge conflicts with remotes/origin/ptf