Continuation of commit 5628cbc