PMC-19530 - changes from Audrey