Merge "Fix double DBG check." into lmp-dev