reapply 542
Merge pull request #613 from YaleSTC/613_nonadmin_flash_2

542 reverted