pulled soa transformer from wip-develop