Hi @falah123,
PR is merged, and the upcoming v15 update will resolve your issue without any customization or override.