Merge branch 'brainopia-remember_frozen_state_in_transaction'