Merge "DO NOT MERGE Fixing some regressions" into lmp-dev