fixes Ticket #9455
Merge branch 'origin/develop'