MBS-4419, freeze/thaw things Catalyst wants to store in a session.
Merge branch 'mbs-4419' into beta

* mbs-4419:
  MBS-4419, freeze/thaw things Catalyst wants to store in a session.