Merge branch 'features/initial-state_rights' into 'develop'