Continuation of commit 9e23a11