Operate on ZXY scheme.
Merge branch 'dev' into dev-nogyp