CR-1621 additional sanity checks