More validations see BT#6449