port changes from #13947