Merge "Remove duplicated implementation of IMF Manager" into devel/master