Merge branch 'master' into Adar
summary UI
Merge branch 'Adar'