Merge newstyle into the main branch