ISSUE-133: Blocks attach support