Merge pull request #2248 from barsgroup/bugfix/35980