Manually merged PoGo606 commit