Continuation of commit 386749a