Aplied patches from Haikuports

GCI Task