First try, workaround for issue 6086
Merge branch 'issue6086'
Update version number