TF-4726 Composable validator (#4729)