Merge MICO 2.xx to master

Legacy MICO v1.xx has been changed to branch MICO-1.xx