Pull Request: CX_Rami_Reverting_Master_State

@ahmedhagii