Cherry-pick commit's with messages 3, 4 and 7 onto master
