Copying over the latest set of changes from the DeliteProfiler repo