Content validations

Merge from sushil to sprint 4