Bug 5508/rewrite techniques to use normal ordering on 2 11

One commit for new versions, one commit for reordering