Merge "Fix issue in IJM where view becomes invalid." into main