Please review branch feature/ZEN-8419_maxClauseCount