Update GlobalBlocking to master

Change-Id: I015799b7b11bc5346c64d404c498c7fd693202a6