cherry-picked changes that allow sybmolic strategy from dev