Merged revisions 1463856 and 1464001 from the trunk. Those changes are required to get profiling results to match with the trunk (we need the ability to turn off logging).