Introduced maintenance mode and backport bug1247056