Merge branch 'release/concern_in_observer' into develop
Merge branch 'develop'