As was done for `master` branch in #993
As was done for
masterbranch in #993