Merge "Put annotations in the right place" into lmp-dev