Merge "Fix issue with using locally defined attrs in a shared lib" into lmp-dev