TRUNK-3836: Further improvement on fix