Update logic in ValidationCodeProcessing.
Test Passed. Could be merged to master Version