Continuation of commit 7e40024