Added support till 26.2
