SI-6811 Scheduled removal of deprecated items for 2.11