Merge branch 'kb/status-ignored-optim-2' into maint