Merge "Consider change task siblings & their descendants for duplicates" into stable-3.5