Can you use clean software from jetapck and along with the instructions from the post?
I believe this should work without any problem. Not sure if your “Also we have some r5 AON code that uses print_isr.” could cause problem or not. So better not including them first.