Ticket #3219
Merge branch 'develop'