Mark TODO #14 as work in progress and link to the patch tracker