[qarte/f37] (3 commits) ...Merge branch 'master' into f37