Patches for YaPI and S390 ported from Code-11-SP2