Merge branch 'release/3.1.6' into main

4 jobs for 3.1.6 in 5 minutes and 34 seconds (queued for 5 minutes and 37 seconds)
latest