Merge branch 'stf606-draft' into stf606-final