Merge "Add smart idle maintenance service"