Merge pull request #2901 from castillofrancodamian/cshark