OSDARLID-1509

OSDARLID-1509