MVP-1006 - Adding refresh as an interm solution