ak5 to ak4 transition

Merging updates from AK5->AK4 transition to the main branch, on top of 710pre7. Also updated to main branch that is not in 710pre7.