@fabpot I've removed this TODO. The PR is done