merge zoomswap patch and configuration