Sync upstream changes to shiny