GOR-497

GOR-497