issue #20341 update tag for 4.0.5