Merge "Fixing wrong tag usage" into lmp-dev