Continuation of commit e3c1323