Marking this as fix committed since the issue was resolved with code merged today from the collab/gmcharlt/webstaff-sprint2-sprint3-round2 branch.
Marking this as fix committed since the issue was resolved with code merged today from the collab/ gmcharlt/ webstaff- sprint2- sprint3- round2 branch.