Merge branch 'dev' into 330-dev-minify

Status Job ID Name Coverage
  Test
canceled #2002
test