Continuation of commit 4262677