Merge commit 'f9f6e2c' into nd/attr-match-optim-more