Merge remote-tracking branch 'jpab/issue-2113'
(cherry picked from commit ca00e56791c468ebecba9f67f416cec1554b3708)