Merge "Fixing ImfManager compile issue" into devel/master