Merge "Fix unknown tag @throw" into lmp-dev