Merge "Fix invalid conditional check." into lmp-dev