Merge "Increase the number of system PIC nonces" into main