Merge "Added option to control debugging info on/off."