Merge "Rework the task affiliate chain validation" into lmp-dev