CLC-2600 (QA) Feed whiteboard fixes

QA branch ports of #1634 and #1633

https://jira.media.berkeley.edu/jira/browse/CLC-2600