Finalized changes for Inventor22.