OS-115 Heap leaks related to OS-114 and SUP-577