CP-5731: Fixes list of files. Adds task messages.