Pr/15: 2.6 support