Merge branch 'master' into 'feature/design_template_ven_job'

# Conflicts:
#   Gemfile.lock
Status Job ID Name Coverage
  Build
failed #1585
build

 
  Test
skipped #1587
allowed to fail
codequality
skipped #1586
test
 
Build build
No job trace