Continuation of commit e22f377