Merge "Put debug/log code under verbose flag" into sc-dev