Comitted after merge with 'make deploy'