Dev admin enhancements merge