INFR-28161 Close ticket and mark resolution acccordingly, fix