Merge branch 'stable-3.0' into stable-3.1

* stable-3.0:
  Fix for replenishing schedule

Change-Id: Iebd3286b34e205b772b826f03686fd898f817581