Continuation of commit 676f88d