Continuation of commit 3bd4168