Merge "OwnerInfos code cleaning" into lmp-dev