Merge work done on centered scheme and mapping on credit into master