avoid repeating package
Merge commit '9a306069258528e337007b53ce864968df79d00a'