Merge "AAF-876-Block of commented files are removed from the file"