Merge branch 'pmtimer-overflow' into release