CORE-542 Script error when adding comment