@embray - just to check, is it normal that we no longer pass ``PACKAGENAME`` here?