Continuation of commit f3825d3