Merge "Remove unsafe methods" into lmp-dev