Merge branch 'develop' into fix/improve-optimistic-ui