Add support for special query value '?'
Merge branch 'Cougar-sdp' into develop