Merge "Do not run unnecessary code in the common case"