Merge branch 'ticket18891'