Merge branch 'update_kabiro_20211015' into 'master'

Add icity TP 3.1 content

See merge request !20
2 jobs for master in 24 seconds (queued for 6 seconds)