OOIION-1561: Improvements to data agent control tool