Merge "Fix current.txt build break" into lmp-dev