bring quality stuff inline with upstream