Merge remote-tracking branch 'origin/master' into MAJ-1097
Merge branch 'MAJ-1097' into magdageo