shrine-medco/1.22.2.x

feature/sprint2