Revert "lbd update"

This reverts commit 68b8af875b3c5492f73c9bf4d4cf1cc2d9db2da1.
Revert "Revert "lbd update""

This reverts commit f6401c4bfc52a651768930f89b33ddedd36d09cc.
Merge remote-tracking branch 'origin/master'