Merge branch 'wip' of ssh://github.com/lnls-sirius/dev-packages into wip

Merge branch 'wip' of ssh://github.com/lnls-sirius/dev-packages into wip #2327