Merge "Fix packageMonitor" into main