OK ok, making the hotfix more visible and logging all as requested in @lslezak's comment