Merge branch 'stable-3.1' into stable-3.2

* stable-3.1:
  Fix for replenishing schedule

Change-Id: Iabe90591b62d58d87f7c21ea50335b0446d5a729