Merge branch 'master' into bytarget_block