Merge remote-tracking branch 'origin/CoreProduct' into BS-2037
Merge branch 'BS-2037' of https://github.com/bonitasoft/bonita-studio.git into BS-2037