#C7 - other #C6 changes

#C7 - other #C6 changes