fixed info
naming
Merge branch 'mlucy_2094' into next