backport version 1.8.3