Should be the bulk of the changes for merging freemix_akara & zen
More updates identified from testing