Fast forwarding LDP branch to current master version.