Merge from STC-1000+ (PI)