Merge "Prevents duplicated finishing activities" into main