backport of IB/isert commit to '5.10.y' stable release