Merge branch 'integration/master' into rhbz1122776