Merge "(bug 33689) Fix incomplete query on constraints"