Rebase voxe/backoffice to merge pull request #84