Merge "Remove using of deprecated self.headers (part2)"