[qarte/f37: 3/3] Merge branch 'master' into f37