Continuation of commit 3bc9e57