[WIP DO NOT MERGE] Temporary workaround for wax TST prefix issue - use STM instead