Merge "Optimize the flow for checking [Duration Available]" into main