Rebase to fix chemical chest and packet issues from earlier namespace changes.