Backport #272