Fix related to queries with c-style comments
Merge branch 'u/jbecla/DM-1601'