Updated for new release 1.8.12.0