Continuation of commit e6e1d28