Sync with Micromint codebase