Merge "CHR query translation and support for assignment in CHR bodies"