Merge remote branch 'apache:add-combinatorics'