[XAPID-1088] fix resource leak, address comments
7 files changed