CLC-1813 QA branch version of HotPlate fixes

https://jira.media.berkeley.edu/jira/browse/CLC-1813