Merge branch 'extensibility_feature' into 'staging'

Extensibility feature

See merge request !67
2 jobs for staging
in 1 minute and 34 seconds, using 0 compute credits, and was queued for 3 seconds