Adding some TODOs here: cc: @Roger-luo @johnzl-777 @david-pl ┆Issue is synchronized with this [Jira Task](https://quera.atlassian.net/browse/OT-9) by [Unito](https://www.unito.io)
