The issue mentioned in the TODO was resolved in 0fa536e5.
mentioned in commit 0541567a
Status changed to merged
Mentioned in commit 0541567a