Feature/cfy 1105 step2 normalize local context