Fixing #29436 and @ready
Merge pull request #16 from hpetev/todo_id-#29436

This PR has been merged