Feature #1613: Monitor DS as soon as oned starts
(cherry picked from commit 02fa009969b3d2e4b2f9c38771a4e9e7d5511ff2)