Updated to work with GHI SDK v4.6.2.