Merging in master
Adding cache reset by path back in after master merge