Case 3359 - Avoid fetching same availability info twice from server.
Merge branch 'case-3359' into develop

* case-3359:
  Case 3359 - Avoid fetching same availability info twice from server.