Merge Develop into Monitoring-Capab