Issue #24746:add CheckMode
Merge pull request #1939 from garyhgohoos/24746

Issue #24746:add CheckMode