Merge "Add expired services removal flag" into main