Merge "Functional Test Updates for I Release"