Merge branch 'master' into secondStep
add migrations review
Merge branch 'secondStep'