Implement feature for issue #1725

[monilpat]

Is your feature request related to a problem? Please describe.

The current implementation lacks the functionality specified in issue #1725, which is essential for enhancing user experience.

Describe the solution you'd like

Implement the feature detailed in issue #1725. This involves modifying the existing codebase to include the new functionality, ensuring that it integrates seamlessly with the current system architecture.

Describe alternatives you've considered

Considering the implementation of a workaround, but that would not provide a long-term solution and could lead to additional technical debt.

Additional context

This feature is critical for meeting user requirements and improving the overall performance of the application. Please refer to issue #1725 for specific details on the required changes.