Merge "Fix trigger for validate tasks"