changes to be squashed

Authored by davidedmundson on Nov 6 2019, 11:40 AM.