status reports fix alerts
fix
Merge branch '0001-core-update' into develop