Merge remote-tracking branch 'cedric/feature/editersouscription' into refconfig