OC-8421 Additional suppression of benign warnings