[249] Manual merge of changes for publisher dashboard caching