Merge "Do not overwrite hidden access flags for intrinsics" into pi-dev