Patches included/ported: 2553e44e8dec75d99408b56f469ff4be61c84336 79d338a90c1a99fce9334bea5d4c296f190373fc