Merge branch 'F6334-T3-Editor' into 'master'

F6334 t3 editor

See merge request !138
1 job for master in 2 minutes and 3 seconds (queued for 2 seconds)