This is a MR for a fix that has been applied on the previous implementation of code_validator already.