Merge branch 'stable-2.16' into stable-3.0

* stable-2.16:
  Fix for replenishing schedule

Change-Id: I3db9add8e21437546d8ae91630bca8720ff0b371