Merge of Temp & Dev02 code