Merge branch 'source_shape'

2 jobs for master in 76 minutes and 46 seconds (queued for 2 seconds)