QS and Ribbons (2/2)

Change-Id: I7f7fc6138417a4bcad38e20a8492f238ce2b080c