Synchronize with upstream & fix small rendering glitch