Merge branch 'master' into mnemo_4_2
Merge branch 'mnemo_4_2'