Merged changes from stc-1000+.