Merge remote-tracking branch 'matsa/master' into translation