Update Stashboard

Update Stashboard to include the latest changes from upstream.