Merge pull request #2078 from alarcher/x11_S12_98_4