Merge "Unhide." into lmp-dev