Merge commit 'intrigeri/pedigree'