Merge "Bring back debug option"