wip/coldfire/patches
