Bug 1059967 - Updating SHB to conform to UX v1.0 spec