Fixes  #6438

Also fixes some missing lattices at the nuke op base
Merge remote-tracking branch 'upstream/master' into apc
Merge pull request #6444 from mwerezak/apc

Fixes #6438