Synchronized with the official repository