Merge "Fix duplicate detection for tasks generated by change tasks-factory" into stable-3.10