* Small refactorings following-up on PR-4551 * Adjust thread context class loader * Address Shams' comments