Fixed issue with package manager +
Fixed issue when changing a resource's parent
Merge remote-tracking branch 'upstream/pr/11651' into pr/11651

* upstream/pr/11651:
  Fixed issue with package manager + Fixed issue when changing a resource's parent