Merge branch 'jl/nor-or-nand-and' into maint