Merge "Add hack to fix RC4_INT problems"