loredana branch: 4 commit
Merge remote-tracking branch 'remotes/origin/master' into loredanaBranch
loredana branch: 1 commit for patch
first commit for patch
(cherry picked from commit fde9672)