Merge "Extract transforming logic from validator"