Revert "Revert "Merge branch 'extraction'""

This reverts commit 1ee7726dbbf831f7510901d4ab2c556f2ef5272a.