[marble/f16: 2/2] Merge branch 'master' into f16