Merge "Add tests for ClientController#verifyClientAndPackageMatch" into main