Merge "Add functions to handle idle maintenance"