Merge "adding in release branch for testsuite"