Transferred todo to github issues [skip ci]