Merge "New additions/bug fixes required/found when porting perf."