Common ui ref removed as well to get rid of other possible issues with duplicate UIRefs.
Additional changes for Crypto++ 5.6.2 upgrade