Merge "Null out "@null" attributes." into lmp-dev