Dev

added 18 commits

• 0e132232...19f6bec0 - 17 commits from branch master
• 2dc49909 - Merge branch 'master' into dev

Compare with previous version

enabled an automatic merge when the pipeline for 2dc49909 succeeds

mentioned in commit 2a82da6d

merged