Merge "Null checker for performance tracker" into main