Merge "Mention relevant tasks in comment (follow-up to c8733333)"