Merge " Soft-float cleanup"