Yesterday
merge from outbreaksci_viewmodel_reference_fix