[#2496] Added missing @Support annotations