* Used updated task, instead of original, non-merged included_file._task. Fixes #39637 * Add changelog entry