Continuation of commit f3b9b9f