Continuation of commit ffdc6c3