Fixed some issue after package dependencies feature
Fixed some issue after package dependencies feature

* origin/pr/12091:
  Fixed some issue after package dependencies feature