Merge "Remove LocalEnd since it is not used" into lmp-dev