Merge "Fix invisible security method" into lmp-dev