LiveOPP: sync with upstream