Merge "Fixing timeout check." into lmp-dev