Continuation of commit d20a47f