Merge branch 'print_nonop_invokes'
Clean up Main