Merge branch 'restruc_kernel' into check_output