Trying to clear ValidationResourceEntity commit issues...