Test cups15 without ssp hack.
Apply additional Richard patch.