PND-1643: shore

Owned by sam