Merge "Change notification interruption calculation" into pi-dev