Fix for issue #1656
Merge remote branch 'origin/bbb-issue-1656'