Merge "Adding TSDR features to integration project."