Merge branch 'hd/config-mak-os390'