admin unit deployment related changes (2)