Merge "FFA Version interface update" into integration