Merge "Generalize apppairs assertions" into sc-dev