Merge "Restore changes that were needed." into lmp-dev