Merge changes I0b5152d7,I00a6f1cd

* changes:
  Temporary debugging
  Remove scanPackageInternal()