* commit 'b82ee0c7bb7fc3ef61e0c31193641e87aecddfe6': Pushing state persistence to a background thread