Rebase

Small PR rebasing on top of master, tested the integration in docker and it works