Commit 1957339df302e2da75e0dbe78b5d566194ab2c08 added the decorator and it's not in stable/havana so we don't need to backport this.
Commit 1957339df302e2d a75e0dbe78b5d56 6194ab2c08 added the decorator and it's not in stable/havana so we don't need to backport this.