Merge "Update profiling properties"