issue #9525 is fixed