First batch of changes towards LDP 1.0.