Merge branch 'avoid_tz_npe'