Rewritten SCOM Section!
Fixed bugs in ciResolver method
Merge remote-tracking branch 'origin/master' into operational_device_refactoring