Update GlobalBlocking to master

Change-Id: I7293ceedd8431218c772860690bcf89f43405057