Synchronized with changes made locally on honey-g-dev