This is blocked until #2735 and associated PR #2772 are closed. This issue will also need further SME outlining before devs can start coding it.