monitoring and mrt - moved some methods and robustness improvments
Merge remote-tracking branch 'origin/monitoring' into monitoring