Merge "Delete TODO about renumbering statd atoms" into pi-dev