Merge w/ SMC Fork.