Feature/arma 4.399.2

Upgrade to Armadillo pre-release 4.399.2