v6.4.1-alpha.0-bunch.1

Merge branch 'bunch_dev' into bunch_dev_6.4.1

v0.2.0-bunch.1

Adds a check to see if the persistence needs to be set. This will avoid some potential crashes.