Sync up with Madhi framework_base

Merge in to sync up with the changes from Madhi rom framworks_base