Finalize Def5 validations

Submit from LP3