Merge "Fix IMF manager issues." into devel/master