Merge "Custom data validator"