Merge "DO NOT MERGE ANYWHERE:revert and resubmit to lmp-* branches" into lmp-dev