merge persistence flag epic into main branch
Description
Merge e/os&115 related epic branch into main branch. This version contains persistence flag related changes & other bug fixes.
Screenshots
Technical details
Tests
Issues
10 commandments of code reviews
Closes #115