Updated changes for 13.1, obs submit rq#213291