Merge "Avoid APF JNEBS instruction with R1 as it doesn't work" into nyc-dev