Extend commit d9e89c0 to ShenCastan