Stnc 10.2 changes to 10.1 branch