Adding validation for feed.
Adding the proper the validations.
Merge branch '6054-1' into 6054-1-faq