18-9-14 afternoon commit