Merge "Fix extraction of package dir from package ID" into main