Backport #492