Init MAMA
cxx
Merge branch 'story/AG-110123' into sprints
Merge branch 'story/AG-110124' into sprints