merge master to user_pages branch 2

Status Job ID Name Coverage
  Build
failed #1618
build

 
  Test
skipped #1620
allowed to fail
codequality
skipped #1619
test
 
Build build
No job trace