merge spinner with upstream
New Build