Merge "Update QAS to further restrict visibility." into main