[#27855697] Add armadillo
[finish #27855697] Merge branch 'armadillo' into master