Merge "Fix bug where maximum provider limit was not being reflected" into main