Introduce ordering of parameters (mode "op")
Merge remote-tracking branch 'origin/master'