Committed changes from Cebo