Merge branch 'dev' into feature/CYKLO-927-Upgrade-Lucene
Merge commit '6a1d383f2f5df37dd7060e7b073a69cecae5e23e' into feature/BAZYNGO-604