Merge branch 'bytarget_block'