Merge "[PIA] add missing flag checks" into main