Merge branch 'stable-2.14' into stable-2.15 * stable-2.14: Fix for replenishing schedule Change-Id: I150874f8f16c55483ad343c856c7bb99dae40b78