Merge branch armadio to master

Signed-off-by: pkoniszewski <pawel.koniszewski@gmail.com>