Merge "Changed attribute name." into lmp-dev