Merge future in for release 1.8.3