Merge ruby193 branch