Merge "Enable class unloading"