Merge branch 'master' into 'gao'

# Conflicts:
#   README.md
Status Job ID Name Coverage
  Build
canceled #1010
build

 
  Test
canceled #1012
allowed to fail
code_quality

canceled #1011
test