griGOR-2367

griGOR-2367