Merge "Add debug mode parameter"