Ribbon fixes and upgrades

Change-Id: I12b16583ce0a41e9680d7f5bbaf59b7cb63a08ef
Merge branch 'ribbon' into HEAD