Merge Admin flash feature back into master for deployment