Merge "Flip the *other* flag" into lmp-dev