Merge "Address plugin-not-found issues"