Increment validator and corresponding mutations

Increment validator and corresponding mutations #5500