Merge branch 'stf606-draft' into 'stf606-final'

Update editor and validation tools

See merge request !9