Merge "Revert "adding a testing line"" into master_copy