cherry pick live buffer capture changes