[4.1] Validator After Before

Pull for #3706.