Merge "Do not throw new incremental not found exceptions" into sc-dev