merge blindside branch, 1.0.8-b2-SNAPSHOT

merge blindside branch, 1.0.8-b2-SNAPSHOT