2nd part of s390/s390x port
10 files changed