A several fixes from 1.1.15. "This gem has been deprecated in lieu of Concurrent Ruby." from github page. And incorporate change from PR pkg/48672.