Merge remote-tracking branch 'mine/master' into dev-fix