Merge branch 'master' into Adar
heat map preferences
Merge branch 'Adar'