Blocked on #3462
Blocked on #3462