Merge "Adding validation of updated policies"