Make support for sided gates
Merge branch 'Prototik-gates' into 6.1.x