Merge last changes from master

in 11 minutes and 57 seconds, using 0 compute credits, and was queued for 1 second