Merge "Workaround fetching user's package resources" into pi-dev