Merge "Add dlclose() to avoid potential leaks" into sc-dev