Merge "Fix erroneous IllegalStateException." into lmp-dev