core-5087 add validation logic