Merge "Handle NPE When Assumption Failure Occurs" into sc-dev