Merge branch 'develop' into 038-Newsletters
task #038-Newsletters: partial commit.
Merge branch '038-Newsletters' into develop