Backport (close #566)