Merge "Make smart idle maint's period changable"