Re Merge from the SMC Fork