Merge "Update to Blast surface control"