Merge branch 'stored-state' into stored-offsets