Merged package updates from the main book.