Take parent from selected diff group
Merge branch 'release/2.47'