I recently played a game with Governor and Inn. On my turn, I played a Governor for remodel, my opponent upgraded into an Inn. I got the option to shuffle cards from my discard into my deck (or at least, I had to click a button saying that I was done shuffling).