Merge master in fix-commonuri.