Enhance maintenance_mode instead of creating a new mode

BugzID: 18955