fix #0
Merge branch 'TICKET-12365'

* TICKET-12365:
  fix #0