Merge "Fix of Cell Configuration issue Issue-Id: ODUHIGH-456"