am efb75031: Merge "Implement TODO" into lmp-dev

* commit 'efb75031e7eac8ee84ca6202dcddd39149d78980':
  Implement TODO