Merge branch 'develop' into feature/store-statuses-data-inside-flag