Fix for nchar issue
Merge on nchar.fix
Fix and merge of 86