Merge "Scheduling group cleanup - add comment, SP_DEFAULT"