Merge branch 'dev-v3.3.1' into issue#7

1 job for issue#7
in 0 seconds, using 0 compute credits, and was queued for 20 seconds