Merge of "change to components with validation "