Issue #3943: Compatible the new method