Ashly McMinn fix-conservatory-leaks0718