GCP-6018 refactor variableconstraints