Merge pull request #1855 from dp-arm/dp/ssbs