Added lb pr from upstream