Merge "Fix bug checking incorrect AppOp" into sc-qpr1-dev