Bugfix 12343

Please pull thirdparty branch bugfix-12343 along with this pull request.