Merge branch 'T3OUpdate' into 'develop'

T3 o update

See merge request !67
3 jobs for develop in 2 minutes and 34 seconds (queued for 1 second)