Merge branch '115-epic' into 115-merge_persistence_flag_changes_into_main