Merge "Use the memory store in BW estimation" into sc-dev