Merge branch 'jonnatan/my-changes' into 'master'
Jonnatan/my changes
See merge request !1151 (merged)
(cherry picked from commit 63624ce2)
2dc11451 Bu and Bc decs 4b348b6d email changes e283cdc2 Fix nickname/file name
Jonnatan/my changes
See merge request !1151 (merged)
(cherry picked from commit 63624ce2)
2dc11451 Bu and Bc decs 4b348b6d email changes e283cdc2 Fix nickname/file name