dev/core#2823 Move validation into validation function