This commit improves a class condition check on the actual implementation rather than the general purpose interface. Closes gh-11608
This commit improves a class condition check on the actual implementation rather than the general purpose interface. Closes gh-11608