Replace String.format() with the plus sign. This improved validation performance a lot.
Merged conflicts.