Updated to latest Imaging SDK, bug fixes and cleanup