Merge branch 'MRQL-82' of https://github.com/fegaras/incubator-mrql