Merge pull request #3249 from dumganhar/iss2404-ext-deprecated

Deprecated warning fixes.