Merge "Change Object profiler to use Environment Options, harmonize environment varia...