WIP - N1QL DP4

Change-Id: Ifc070988ca6e9b7cfd3d2b8247da775079f1898d