Continuation of commit 0d91e09