Merge "Implement TODO" into lmp-dev