am a00bd939: Merge "Enable class unloading"

* commit 'a00bd9395be31bd69a0558b78a48e4279a6ce693':
  Enable class unloading