Merge "Provider Activity Interruption Fix" into main