Merge branch 'develop' into 'japanese'

Update 4.6

See merge request !72
6 jobs for japanese
in 0 seconds, using 0 compute credits, and was queued for 111 minutes and 50 seconds
latest