Merge "Improve IMF visibility log (3/N)"