HEECHARN-3367

HEECHARN-3367