[#2497] Fixed merge issue.