Merged heptapod branch into release branch

Notably this brings twice as much RSpec testing
in the 'extended' scope.

--HG--
branch : heptapod-0-19
36 jobs for !169 with topic/heptapod-0-19/gitlab-13.7.4 in 27 minutes and 22 seconds (queued for 2 seconds)
merge request