Merge branch 'Adar'
Merge branch 'master' into Adar