Support 32 bit and 'reboot on uninstall' scenarios
Merge branch 'PN666_32bit_support'