use_prepared_state
& use_transitive_state
#2650
Merged
use_prepared_state
& use_transitive_state
#2650