Merge branch 'ticket#6694' into develop