Merge "Add app op reserved specifically for testing" into main