Continuation of commit 4fa7a3d