Continuation of commit 177b996